@ahmedGaber93 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

Investigate some issue with Melvin until new PR is opened

@MelvinBot Can you add a proposal here (in this PR discussion) for this issue #88737?

Proposal for #88737

Scan - Merchant field shows "Scanning..." text when editing inline

What is the root cause of that problem?

getMerchantName() replaces the raw merchant value with the translated "Scanning..." string for scanning transactions. This display-only string is then passed as the initial editable value to MerchantOrDescriptionCell, which feeds it into useInlineEditState as the text input's initial value. So when the user clicks to edit inline, the input is pre-filled with "Scanning...".

The RHP doesn't have this problem because it reads the raw transaction merchant ('(none)'/PARTIAL_TRANSACTION_MERCHANT), detects it as invalid via isInvalidMerchantValue(), and initializes the input with an empty string instead.

What changes do you think we should make in order to solve the problem?

In TransactionItemRow, when the transaction isScanning, pass an empty string as the editable merchant value to MerchantOrDescriptionCell while keeping the "Scanning..." display text. This can be done by passing the raw (non-display-formatted) merchant through isInvalidMerchantValue() the same way the RHP does, so the edit input initializes with '' instead of "Scanning...".

Alternatively, disable inline merchant editing entirely while isScanning is true (set canEditMerchant to false), since SmartScan is actively populating the field.

What alternative solutions did you explore?

• Sanitizing inside useInlineEditState — rejected because it would require locale-aware string comparison and is the wrong abstraction layer for this fix.
• Checking in MerchantOrDescriptionCell directly — possible but less clean than fixing at the source in TransactionItemRow where the display vs edit value split should happen.

Note: This proposal was originally posted on Expensify/App#88737. The issue has since been closed after inline editing was reverted. This fix should be applied when re-introducing inline editing.

Alternatively, disable inline merchant editing entirely while isScanning is true (set canEditMerchant to false), since SmartScan is actively populating the field.

@MelvinBot implement that on this PR

Note: we should do the same for input amount since it also display scanning...

To disable inline editing for merchant and amount while scanning, the changes needed are in TransactionItemRow/index.tsx:

1. Merchant: Set canEditMerchant to false when isScanning is true
2. Amount/Total: Set canEditTotal to false when isScanning is true

This prevents the "Scanning..." placeholder from appearing as editable text in both fields.

⚠️ I can't push changes to this PR because I didn't open it and I'm not listed as an assignee. To have me make this fix, add me to the PR assignees and then retry your request.

@MelvinBot add proposal here for #88657

Proposal for Expensify/App#88657

Expense - Significant delay to show Popover of category or date

What is the root cause of that problem?

usePopoverEditState.startEditing() defers popover opening via InteractionManager.runAfterInteractions(). This means the popover will not open until all outstanding interaction handles are cleared.

When the user dismisses a popover (clicks outside), ReanimatedModal creates an interaction handle for the close animation. That handle is only cleared in onCloseCallBack after the animation completes. If the user scrolls between closing and re-clicking, scroll event processing and FlashList cell recycling can delay the animation callback — or worse, unmount the cell before the handle is cleared, leaving an orphaned handle that blocks the runAfterInteractions queue indefinitely.

What changes do you think we should make in order to solve the problem?

Replace InteractionManager.runAfterInteractions in usePopoverEditState.startEditing() with a simpler deferral mechanism that doesn't depend on the global interaction handle queue. For example, use requestAnimationFrame (or two stacked requestAnimationFrame calls to ensure a layout pass) to defer openPopover(). The original comment says the deferral is only needed so that "the anchor is measured correctly" — this doesn't require waiting for all modal animations to complete, just a single layout cycle.

const startEditing = () => {
    setIsEditing(true);
    // Defer opening until next frame so the anchor is measured correctly
    requestAnimationFrame(() => {
        openPopover();
    });
};

This eliminates the dependency on the ReanimatedModal close animation's interaction handle lifecycle entirely.

What alternative solutions did you explore?

• Ensure interaction handles are always cleared on unmount — ReanimatedModal already has cleanup logic, but FlashList recycling can cause unmount timing issues. This would be a more defensive fix but harder to guarantee across all scroll/recycling scenarios.
• Add a timeout fallback to runAfterInteractions — e.g., setTimeout(openPopover, 300) as a safety net. This is fragile and doesn't address the root cause.
• Disable inline editing during scroll — unnecessarily restrictive and doesn't fix the underlying interaction handle issue.

Next Steps for Contributor+ team: Reply with @MelvinBot implement this to create a draft PR, @MelvinBot <your feedback> to refine this analysis, or explain why you are rejecting Melvin's proposal.

@MelvinBot add proposal here for #88652

Proposal for #88652

Expense - Merchant cannot be cleared by inline editing

What is the root cause of that problem?

editTransactionMerchantInline calls isInvalidMerchantValue() which treats empty string as invalid and returns early without calling updateMoneyRequestMerchant. This blocks clearing the merchant for all transaction types — including unreported self-DM expenses where clearing the merchant is a valid operation.

After the silent rejection, useInlineEditState.save() resets localValue back to the original value (line 38), so the UI reverts as if nothing happened.

The existing non-inline editing path (updateMoneyRequestMerchant) accepts empty strings without issue, so the backend supports this operation — only the inline guard blocks it.

What changes do you think we should make in order to solve the problem?

In editTransactionMerchantInline, relax the guard to allow empty merchant strings for unreported expenses. The params object already contains the transaction and report context needed to determine whether the expense is unreported. Specifically:

1. Pass the transaction/report context into the guard check.
2. Only block empty merchant for reported/submitted expenses (where merchant is required), and allow it for unreported expenses (self-DM without workspace merchant requirements).

This aligns with the RHP editing behavior and the comment from trjExpensify on the issue: "selfDM without a workspace can be used without merchant requirements, so it probably makes sense to follow the merchant field restriction that allows it to be blank when unreported."

What alternative solutions did you explore?

• Removing the isInvalidMerchantValue guard entirely — rejected because it could allow clearing merchant on reported expenses where merchant is required, which would match Classic's behavior of blocking empty merchant but could cause data integrity issues.
• Moving the guard into useInlineEditState — rejected because the hook is generic and shouldn't contain merchant-specific business logic.
• Disabling the edit button when merchant is empty — doesn't apply here since the user is trying to clear an existing merchant value, not edit an empty one.

Next Steps for Contributor+ team: Reply with @MelvinBot implement this to create a draft PR, @MelvinBot <your feedback> to refine this analysis, or explain why you are rejecting Melvin's proposal.

@mohammadjafarinejad I investigate another fix instead of editusePolicyForTransaction here #88715 (comment) which will fix those

• Reports - "Tax no longer valid" appears briefly after inline editing any field. #88676
• Reports - "Rate not valid for this workspace" error when inline editing distance track expense #88683
• Expense - Category inline field is clickable and opens a blank list when categories are disabled #88715

We will use the entire policy in the useTransactionInlineEdit function.

    const [completePolicy] = originalUseOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(policyID)}`);

Then pass it here policy: completePolicy ?? policy,

#88722 (comment) LGTM for #88737

#88722 (comment) LGTM for #88657

Fix for #88652

edit editTransactionMerchantInline to be:

/** Updates the merchant of an expense from the Search results table or the Expense Report page. */
function editTransactionMerchantInline(params: TransactionInlineEditParams, newMerchant: string) {
    const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${params.transactionID}`];
    const isUnreportedTransaction = isExpenseUnreported(transaction);
    const isClearingMerchant = newMerchant === '';
    const isInvalidMerchantForUpdate = isInvalidMerchantValue(newMerchant) && !(isUnreportedTransaction && isClearingMerchant);

    if (isInvalidMerchantForUpdate) {
        return;
    }
    const iouParams = getIouParamsForTransaction(params);
    updateMoneyRequestMerchant({
        ...iouParams,
        value: newMerchant || CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT,
        hash: params.hash,
    });
}

Fix for #88748

Disable category editing when shouldSelectPolicy is true

Changes

pass shouldSelectPolicy to getTransactionEditPermissions

    const isPerDiem = isPerDiemRequest(transaction);
    const {shouldSelectPolicy} = usePolicyForMovingExpenses(isPerDiem);
    
getTransactionEditPermissions({
   ...,
   shouldSelectPolicyForUnreported: shouldSelectPolicy
});
    

canEditCategory will be:

-        canEditCategory:
-            (isPolicyExpenseChat && (!!categoryForDisplay || hasEnabledOptions(policyCategories ?? {}))) || (isUnreported && (!policy || hasEnabledOptions(policyCategories ?? {}))),
+        canEditCategory:
+            (isPolicyExpenseChat && (!!categoryForDisplay || hasEnabledOptions(policyCategories ?? {}))) ||
+            // For unreported expenses, disable inline category editing while workspace selection is required.
+            (isUnreported && !shouldSelectPolicyForUnreported && hasEnabledOptions(policyCategories ?? {})),

@MelvinBot add proposal here for #88640 (comment)

Proposal for #88640

Report - Amount field accepts 0 amount in IOU expense when inline editing

What is the root cause of that problem?

The inline amount editing path lacks the zero-amount validation that the RHP already has. Specifically:

1. TotalCell.handleAmountSave checks parsedValue >= 0, which allows 0 through.
2. editTransactionAmountInline only guards against negative amounts (newAmount < 0), not zero.

Meanwhile, the RHP correctly rejects zero amounts for P2P requests via isAmountInvalid(), which blocks amounts below 0.01 for REQUEST/SUBMIT on P2P reports and for PAY/INVOICE/SPLIT types. This validation was never replicated in the inline edit path introduced by PR #83127.

What changes do you think we should make in order to solve the problem?

Add a zero-amount guard in editTransactionAmountInline. The function already receives params which includes parentReport. Use isIOUReport(params.parentReport) to determine if the expense is P2P, and reject newAmount === 0 (or < 1 in backend amount units) in that case — mirroring the logic in isAmountInvalid().

This is the correct layer for the fix because all inline amount edits flow through this action, making it a single point of enforcement.

What alternative solutions did you explore?

• Changing parsedValue >= 0 to parsedValue > 0 in TotalCell.handleAmountSave — simpler but would block zero amounts for all report types, including expense reports where zero may be valid.
• Replicating the full isAmountInvalid() check in TotalCell — rejected because it would require threading IOU type and P2P context into a UI component that shouldn't own business logic.

Next Steps for Contributor+ team: Reply with @MelvinBot implement this to create a draft PR, @MelvinBot <your feedback> to refine this analysis, or explain why you are rejecting Melvin's proposal.

Fix for #88640

function editTransactionAmountInline(params: TransactionInlineEditParams, newAmount: number) {
-   if (newAmount < 0) {
+   if (newAmount < 0 || (newAmount === 0 && isIOUReport(params.parentReport))) {
        return;
    }